Some more changes from Michael K. Johnson for Linux.

	* s/template.h: Mention that you should #define HAVE_TERMIO or
	HAVE_TERMIOS, but not both, and that HAVE_TERMIOS is preferred.
	* systty.h (EMACS_SET_TTY_PGRP): Don't assign the return value of
	tcsetpgrp to *pgid; it's just a status value.
	* config.h.in (HAVE_RANDOM): This shouldn't be defined on Linux
	systems using XFree386, and perhaps is inappropriate in general.
	* m/intel386.h: #undefine the integer size macros, since the Linux
	<values.h> file #defines them itself.
	* mem-limits.h (get_lim_data): Linux has the ulimit call; if it
	fails, fall back on ULIMIT_BREAK_VALUE.
	* process.c: Linux needs the WAITTYPE, etc. definitions.
	* unexec.c (hdr, ohdr): Linux has the ordinary `struct exec' type;
	no need to use SYSV names.
	* s/linux.h: New file.

diff --git a/src/m/intel386.h b/src/m/intel386.h
index f359af573116a5d148af72b81a3e80a668982d36..aa1bf2950463d02f1fe11af2beab7210a25a4aed 100644 (file)
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -26,12 +26,14 @@ NOTE-START
 Intel 386 (-machine=intel386 or -machine=is386.h)
 
   The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
-  isc2-2, 386-ix, esix, sco3.2v4, and xenix.
+  isc2-2, 386-ix, esix, linux, sco3.2v4, and xenix.
 
   18.58 should support a wide variety of operating systems.
   Use isc2-2 for Interactive 386/ix version 2.2.
   Use 386ix for prior versions.
-  Use esix for Esix.  It isn't clear what to do on an SCO system.
+  Use esix for Esix.
+  Use linux for Linux.
+  It isn't clear what to do on an SCO system.
 
   -machine=is386 is used for an Integrated Solutions 386 machine.
   It may also be correct for Microport systems.
@@ -49,6 +51,12 @@ NOTE-END */
 /* The following three symbols give information on
  the size of various data types.  */
 
+
+/* Linux defines these in <values.h>, but they can't be used in #if's */
+#undef SHORTBITS
+#undef INTBITS
+#undef LONGBITS
+  
 #define SHORTBITS 16           /* Number of bits in a short */
 
 #define INTBITS 32             /* Number of bits in an int */